Long-term Refactoring